Skip to content

Merge dashboard/permissions fixes, dep pin alignment, and upstream sync into bv-develop#12

Merged
Che4ter merged 8 commits into
bv-developfrom
merge/dep-updates-into-bv-develop
Jul 8, 2026
Merged

Merge dashboard/permissions fixes, dep pin alignment, and upstream sync into bv-develop#12
Che4ter merged 8 commits into
bv-developfrom
merge/dep-updates-into-bv-develop

Conversation

@Che4ter

@Che4ter Che4ter commented Jul 8, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • Fixes custom_dashboard owner-delete FK violation and group_permissions NOT NULL crash (from fix/dashboard-fk-and-group-permissions)
  • Aligns 6 dependency pins with contrib/dependency-updates (flask-cors, SQLAlchemy, alembic, cryptography, pyotp, bleach)
  • Merges in 3 new upstream/develop commits (AlertCluster rename, collab GFM table fixes)
  • Adds alembic merge migration resolving the multi-head fork caused by the upstream sync
  • Documents a disposable test-suite podman stack in the dev guide

Test plan

  • Full test suite run against a fresh iris-test stack: 14 failures, 59 errors, 1 skipped out of 697 tests — no new failures vs. pre-merge baseline (15F/59E), all remaining failures pre-existing and upstream-authored
  • Verified app boots cleanly with the new alembic merge migration (no more multi-head error)

whitekernel and others added 8 commits July 7, 2026 15:12
…ross models, migrations, business, REST, schemas, hooks, celery tasks, tests
…NOT NULL crash

- custom_dashboard.owner_id had no ON DELETE rule, so deleting a
  dashboard's owner raised a raw ForeignKeyViolation/500 instead of
  orphaning the (possibly shared) dashboard. Set ondelete='SET NULL'.
- AuthorizationGroupSchema.group_permissions had no load_default, so
  full loads (e.g. group creation) with the key omitted hit a NOT NULL
  violation. Add load_default=0.
flask-cors, SQLAlchemy, alembic, cryptography, pyotp, bleach had
drifted to slightly older patch versions than the parallel
dependency-update work on the upstream PR branch.
Merging the 3 new upstream commits re-forked the alembic head
(dashboard_owner_fk vs collab_doc_seeder_version) - add the merge
migration to resolve it.

Also document a disposable iris-test podman stack for running the
test suite without touching real dev-stack data/volumes.
@Che4ter Che4ter merged commit 1c93926 into bv-develop Jul 8, 2026
6 of 8 checks passed
@Che4ter Che4ter deleted the merge/dep-updates-into-bv-develop branch July 8, 2026 07:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant